From c0b352d1980f2dc9c8ab05851d1f4517c8d5a258 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Wed, 6 Mar 2013 08:54:28 +0000 Subject: [PATCH] arm: initialise VCPU SCTLR in vcpu_initialise Ensuring a sane initial starting state for vcpus other than domain 0s. Signed-off-by: Ian Campbell Acked-by: Stefano Stabellini --- xen/arch/arm/domain.c | 2 ++ xen/arch/arm/domain_build.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c index ac997d6d15..e3088137a4 100644 --- a/xen/arch/arm/domain.c +++ b/xen/arch/arm/domain.c @@ -436,6 +436,8 @@ int vcpu_initialise(struct vcpu *v) if ( is_idle_vcpu(v) ) return rc; + v->arch.sctlr = SCTLR_BASE; + if ( (rc = vcpu_vgic_init(v)) != 0 ) return rc; diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index e9c84c76b4..d4fb74fd89 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -455,8 +455,6 @@ int construct_dom0(struct domain *d) } #endif - v->arch.sctlr = SCTLR_BASE; - WRITE_SYSREG(HCR_PTW|HCR_BSU_OUTER|HCR_AMO|HCR_IMO|HCR_VM, HCR_EL2); isb(); -- 2.30.2